From 79c77414dd7ba5bf650128826d9670adb30a930c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 29 Apr 2015 11:19:53 -0700
Subject: [PATCH] Fix the test for `cargo test --release`

---
 tests/test_cargo_test.rs | 49 +++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
index 8fbb98a38..700007c32 100644
--- a/tests/test_cargo_test.rs
+++ b/tests/test_cargo_test.rs
@@ -48,50 +48,67 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
 
 test!(cargo_test_release {
     let p = project("foo")
-        .file("src/lib.rs", r#"
-            extern crate bar as the_bar;
+        .file("Cargo.toml", r#"
+            [package]
+            name = "foo"
+            authors = []
+            version = "0.1.0"
 
-            pub fn bar() { the_bar::baz(); }
+            [dependencies]
+            bar = { path = "bar" }
+        "#)
+        .file("src/lib.rs", r#"
+            extern crate bar;
+            pub fn foo() { bar::bar(); }
 
             #[test]
-            fn foo() { bar(); }
+            fn test() { foo(); }
         "#)
         .file("tests/test.rs", r#"
-            extern crate foo as the_foo;
+            extern crate foo;
 
             #[test]
-            fn foo() { the_foo::bar(); }
+            fn test() { foo::foo(); }
         "#)
         .file("bar/Cargo.toml", r#"
             [package]
             name = "bar"
             version = "0.0.1"
             authors = []
-
-            [lib]
-            name = "bar"
-            crate_type = ["dylib"]
         "#)
-        .file("bar/src/lib.rs", "
-             pub fn baz() {}
-        ");
+        .file("bar/src/lib.rs", "pub fn bar() {}");
 
     assert_that(p.cargo_process("test").arg("-v").arg("--release"),
                 execs().with_stdout(format!("\
 {compiling} bar v0.0.1 ({dir})
 {running} [..] -C opt-level=3 [..]
-{compiling} foo v0.0.1 ({dir})
+{compiling} foo v0.1.0 ({dir})
+{running} [..] -C opt-level=3 [..]
 {running} [..] -C opt-level=3 [..]
 {running} [..] -C opt-level=3 [..]
 {running} `[..]target[..]foo-[..]`
 
 running 1 test
-test test_hello ... ok
+test test ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
+
+{running} `[..]target[..]test-[..]`
+
+running 1 test
+test test ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
 
+{doctest} foo
+{running} `[..]target[..]test-[..]`
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured
+
 ",
-        compiling = COMPILING, dir = p.url(), running = RUNNING)));
+compiling = COMPILING, dir = p.url(), running = RUNNING, doctest = DOCTEST)));
 });
 
 test!(cargo_test_verbose {
-- 
2.30.2